Support Malta
Merge branch 'support-malta' into custom