Singapore

patches from

Singapore