PAPI-1086: First developments (partial commit - local before weekend)
PAPI-1086: First developments (partial commit - backup before weekend)